added day and month handling