updated old change that removed Array() for speedup