added code and addidtional file for feature 2