modified a bunch of shit