Us 03 jg refactoring