Improvement for Denis to separate date and time