combined first commit