wip change to SMD headers