\r removed everywhere