Made it more general.