Worked on #575 and worked on #561