complete sample4 refactoring