Pre final changes