Some rewrite to register