included pagination and view updates