Modded for ArrayWork