Updated gn and mappings