changed design in lists and removed some redundancies