Changed one more macros