4th time is a charm - revised models and migrate files