PS improvements