Rewrite to simplify for 1.0.0