Changes for the new version