Remove wait and add confirm