updates from Lisa
next round of changes from Lisa