final changes i think