SQUASH ME: Address @kaspar030's comments