GSW: tweaking a few things.