add checks for year, month ... fix bug due to missing import, but fix it to be cleaner