working on batoo integration helped to find some improvements.