#55 & #71 tasks done