Added year and cert logic