pre merge
merged, patrol fully working