Old and new version now has defaults