Added year checks