add camera to interface
fix merge conflicts