Phase 3 of changes from feature/modules_integration

Check value of t_id.