added a bunch of crap