Updated Timing and List stuff