Upcoming changes to 4.0