Change gi mapping to be a bit more friendly for my usage ...