updated for acceptance testing for v1.1