Added leap year handling 2