update after patrick review