implementing and testing new registry system.