twbt merge, LeoCean's changes 9/20