More ch20 changes... testing...