Added Risto's edits.