Change from Time do DateTime (restoring Tomek's upgraded version)