TBS2 class update by Avadhan Larson