New changes time line view
Merge code chnages