new version including tizbacs latest changes