added back in a lot of settings and components