CHANGE: Array functions changed to macros