Added timestamps and more code for annotate