Rewrite for 0.5