Updated with space for the merchant stuff