Continued replacing routines with new class Arr based routines