Better rc support