1at roung qa response

changes made to solve qa bugs