Changed Year to use year function