0059: change self.wait to self.cp.wait, add setter function