major changes made for timeline/lifeflow code