Updated camerhandler