switching vendor to more homogenized layout (for now)