performance fix for methodchanges
fixed merge conflicts