Gi5 edit style

for #5