added invite and touch of clean up