Added changes for the incomming new version