Onsite testing

Proposal of changes for live environment.