Changes to shortcode