Update GS binary
Refactor; add new interface to eliminate code duplication