moved some registration stuff around