added more shortcodes