Changes made for PSE