Moved various bits of PS around