made a lot of changes to models