SQUASH ME: addressed @kijeweski's comments