replacing some maor