Revert "Revert "Advanced Setting Back""

This reverts commit 2c1c6770bdba9aa82aaa599ed59d37ec310cf3cc.