Made header overrides generic, can work on any header
update version