hopefully more stable TBC