Implemented FeatureB
Merged FeatureB