Qa

changes please QA test it