#161 adjustments