Stage1 of final changes before deployment