mask fix in mentor
minor changes