Change ordering from tuple to list