Ch 11 adjustments

Adjustments to accommodate the Ch 11 updates.