Fixed: More variables