#12821 Lockwood

part 1 of Lisas ADjustments