[0007] Safe Rewriting acomplished