Shortcode changes

Shortcode changes