refactored merchants