Its a proper shortcode now