Adding first part of new feature
Adding second part of new feature