Fix #351 - Now tracking state as we go up & down