Changed to use rev-object implementation