Second macro type implmented. Minor improvement in efficiency