Increasing some timeouts and splitting big method