[#75] Rewrite