can simplify code a bit now that timestamps can't be null