few changes part 2