commit almost final