Improvements following testing