SQUASH ME: Address @OlegHahm's comments