more changes to models