Still not reading EXTH
Moved around namespaces