Added new feature B