Bug2 Work first commit

Bug2 Work second commit

Bug2 Work third commit