changed and added a bunch of shit