lynn's commit 12/7