Added custom order functionality