---Small updates, time correlation still not finished