Included Jaakko's comments