todo about termination and remove some pauses