just merging in derick's work