0.5.0 rewrite