adding more support for primaries and transfers of primaries