Rebasing + adding Mufid function