Revert "Joining Modal Modification"

This reverts commit 4ae9d3b6f57039f86a7df8333088a28ae43e5446.
Revert "Revert "Joining Modal Modification""

This reverts commit b5819799609264d7676117329e5c8b0fa88d753a.