Modifications for generic use.