Fix everything during mentor session