Task #29 , #41 and #42 done