khaled Eighteen commit