various changes in line with PSDs