Flat commit version finished