changed after qa