Added timestamps and other updates