update controller to china_contrib
adding todo for bonus choice