Incorporating Anssi's feedback.