Making it more generic.