timelines should continue past current amendments