Major changes to Volunteer side