merge Mohammad's work