made name keeping more efficient