Updated to fix header glitch