Main updated + settings added