first commit (part 2 :()