updated shortcodes