Updated PF Shortcode