improvements for TLD