updated to use new Array scheme.