update after QA 2.0 version