Dropping back to a pure array implementation