Change defauld to true intead of waiting