CS updated to include Username