Made both generic.