Classes changes (part3) - untested