commiting so that Hongxia and I can parallelize on the UI