#19 More adjustments