merging betsy's work in