Use dates in current month rather than always 31