SQUASH ME: addressed comments from @authmillenon and @LudwigOrtmann