More adjustments to GO