G2 - improve mount performance