Issue 3

Issue 3 done