minor adjustment to output defines