Move to make_array