Swapped r and d