changed to adjust for singular/plural