Lori's disp
merged branch