smarter date completetion!