Headers added and code validated