Worked on #70 and #79