adjust after ceferrari refactoring