add whether orders are entered with correct order
merge conficts