Slight changes to mapper, conditional on debug statements in CPU