Started some changes towards the new version.