Some tweaks to narrow down answers, still some unneeded variables come in