Added a line writer plus more