We are replacing modal now so why not to refactor …?