Affirm. Class 2 <40yrs old = 5yrs. That said, the date on your medical is the one to go by. I was lucky in I sent my medical (class 2 at that point) in for a correction just after the change. Lo and behond it came back with an extra 3 years validity - result!