Registration working, uh, better