Updated camera controller