updates based on Keith's comments