more work for TC refactor