cleaned up model interactions