Onsite/Offsite Improvements