Adding code for feature 0 to test