Updated shortcode