tyr: update according to comments