Tighten up the lists