small addition of header-dropping function
merging changes