Removed Timeout from not necessary spots and decreased to 1000