Added correct newline stuffs