added a bunch of shit