Make gi more user-friendly