Done control (7/30)

Done control