Revert "Revert "Trying changes in main.xml""

This reverts commit 6bc927dffca27a00adddb08e426b5f20dde0dafa.