change in add order, add exception