Commit almost final