Replaced Arrays with lists