also replaced length of year (4), actually closing issue 3