Rewriting - a lot of changes