converted to new mps approach