Added newLine handling