Added new version to work with going forwards