Created a better PS6 from the template

It's way cleaner, imho.