Modified all with new version