Moved two generic methods to come from template. Extended to use up to 16 parameters.