Many classes rewritten