- added new version with extra logging