More minimal changes