make some drastic changes to models