adjusted registration, just a quick thing to help with error handling for now