revamped shortcodes