updated onsite offsite checking