Added buenos for G1, added G2 and did a cleanup