PS 1.6 improvements