added timestamps as well