Updated to a more generic version.