Increasing accuracy and robustness of order promises. Issue 3 (1st February 2017)