added macros, and sub_text to command