onn fix header and add complete/cancel function for dispatcher
conflict fix