Adjusting timeout to 15 seconds (was 8)