Slight changes to speed up rostering