mostly final commit