new version with some bugfixe