Changed the when steps so we could have cleard what it represents.