added bunches of crap