Implement phase 2: state synchronization