Please add these painstaking changes that I spent hours on...