Make changes to separate -i and -g