updates for Brian and adding Diana