Incorporated Timo's comments.