Time parsing modified