design simplification for Volunteer side