Master order feature working