Added proper camera controller