Addded Mustache checks (don't run if not needed)