new version and cleanup