an almost-final version