final changes (i hope)