Changed to arrayList