Made it more generic.