Corrected Yr case