SQUASH ME: addressed @authmillenon's comments