Use the new gic option. While here remove extra whitespace from the ned of
a few lines.