Changed the macro version for a function ... I really don't see why they were using a macro