Integrated all code changes