Refactoring cz3
Refactoring cz 4