more cunning
renaming various things
tweaking