added matt trick to ch20-23