changed some timeouts