some more changes to models