Some macaroni in arrayList fixed