model fix final