Fixed code to verify header with Origin
Updating basics changes