fixing conditional load on function
updating shortcodes