Added in mentor status check