Some more shit working