new version with fixes