New version with tv10 support