Working on the new version