Lots and lots of modifications