Added shorYearCutoff and logic for short year format