Added previous work with the TimeSystem