update after merge #3