Modified pretty much everything