removed more of ExtDP