Removed
Make it work again
Correct some settings