Use filter instead of manually create new array