Changes to solve the List-Problem