Rethink of how MRP attributes are propagated - now working

Also made leave all behaviour compliant to active/passive states