Changes

Stop and start the engine
Check for enabled
Change setting mapping to reflect changes