add year0 + bug correction