updates for 4-28
merged