updated for pagination, date/time