further changes to volunteer system