updated w/ complete codec. includes folding headers