Add on quite a bit of updating and dateline comment