TC-9 Improvements

Possible improvements include: