Improved PS download code