added timestamp and sorting