Update following further testing in a live environment