This SG_ADD might break things, better remove for now (comment out)