Changes for upcoming verison.