more robust reg mapping, changed sample to use these mappings