completed Tero's comments.