Updated everything before turning arrayList into HashMap