Updating: improving libats/funset