final updates for qa testing