TP2 state management - Solution