Updating: improving libats-hwxi/nwaiter