fixed up models