trying to fix the MP bugs