Reverting to register_all