add some tc, not working correctly now