Keep state (15/18)

Keep state