Refactored update roster so that it won't break too much if they change the actual function