Added TC17 and TC18

Added TC17 and TC18