Adding some code for feat 2