Performance optimisation and incrementing the version.