First stab at improving roving mode