merging geoff's hold, etc