1.7.10 Rewrite