first commit by rafiq