Changed arrays to lists