changes to roster processing and hashtable