Significantly improved separation of settings