adding in more entity changes