Change to an array rather than a list