part2

merged changes