Timestamp added and passes tests