Updated pagination (so it actually works)