refactored models, remigrated