Simplified/redesigned so multiple parameters