Issue2 and 3 finished