added buenos for G2 and updated matmult for G3