MPS calculation improved