adding new line everywhere + todo