Changes orders to payments and improves order handling