changes for new feature 2