Tweaking timeouts
Cleaning off duplicates