Part1 changes
part 1 bug fix