More changes to make pd work