Changed state and add unfinished pagination