Updated for \r\n