Package the g file better