Address Timo's concerns from review.