Updated order functionality