more final updated for qa first round of testing