final Mokhtar Commit