add explicit registration to revivers
add comment
just some refactoring