Some rewrite