code changes after QA round