Done control (12/30)

Done control