Fixed NGW and cleaned header