Tightened up lists