Worked on #16 and #19