0412 commit almost final