SQUASH ME: addressed @LudwigOrtmann's comments