added some more shit