some more shit to get it working