SQUASH ME: addressed @fnack's comments