part2&3
merging with lewbranch