changes for order and map