Now persisting props every step