current version with fixes