Reflect state better