Rework design, time on cursor