2.0.0 - switch back to arrays