better refactor existing init to QCOM locations, pt 2