some changes to registry code