Add GSO back in