Nucs and TFs will wait for max 2 timesteps
Alters conditions for real example
Minor TFClass Merge