refactoring to match GJSG