update after merge #2