General updates to the new version