a few changes on the fly during TC with Paul