final changes i hope