adapted to the new shortcodes