Beginning of final changes