added 2nd bench + refactoring