changes to accomodate the move from math::tuple to std::array