initial changes for 4.5