Better filename matching
Timeout to 5 seconds