minor adjustments, again