shifting to new registry convention
latest fix