Worked on #58, #59, #67