Increased timeout to 5 seconds, changed logging