lots of changes to entities