Modification on camera controler