Shouldn't we replace this modal as well, or it's another story?