Redo V59

Include roster again