added MP support