Edited TimeList further