names and values tweaked