Each changed to support multi-parameter functions