issue 1,2,3 done