Added better interrupt tb