Removed question 1 and modified 2