pdr version committed, but seems like it will not scale