Kind of final commit