fix with TJs suggestions