Second improved commit