Reseted to before removed pagination because that broke things