commiting some additional stuff for gmc_sw1