Modified a bunch of shit