added some other crap