Add feature B part 1
Add feature B part 2