to keep safe after newest PS code