More rewritting