merging from jrollins