I think everything is now in the proper model