gasnom refactoring complete