Setting logic changed