After refactoring - with rest