+ added necessary constants to the macro file