Done control (6/30)

Done control