Keep state (16/18)

Keep state