more session prep
merging