keep just one version of subroutine
update header names