Updated changes for new version