Update for modified -g flag