TB changes

Please review