Changes made based on the bugs reported after test 1