updated users
updated macros
updated triggers