Changed camera controller handling