changes to headers .. meant to be part of previous commit