Restored functionality from WesternHotelSupply repo under olsonkr