Senth's changes