before snyc
Added Tutor support and clean up address support.