Changed macro use