improvements to onsite - issue 2