Add Ruckstuhl's efficiency changes by hand