updated for inclusion of timeline and edge conf application