All of Daniel's changes in pd