Please don't forget to update the registry when you're done