Mostly fianl commit