edited to reflect new timeline