updated order behaviour