major changes. entities