Work done for #3 & #9