Update cocobot with Qi's changes