Copy of TC with my Fixes