Issue 4 & 5 done