Fix IF to use new TB system