Drugi commit po refactorze.