[stools] rebased again and working