final changes!! YIKEs