Could you please wrap these additions around 80 chars?