modified to cope for removing ma->mp inferrence in the index