refactoring to the one Barrel