patrol order complete
merge with develop