update with david's stuff