Merging ben's stuff