Enhancement to Time Handling!