Add following feature and fix time line logic