big improvement to spot logic