almost final commit