Nevertheless , Leonardo treated him with great indulgence , and he remained in Leonardo 's household for the next thirty years .
Salai stayed in Leonardo 's household for thirty years as a pupil and a servant .