Enhanced after testing on site