Changing to be generic for use by others.