Update to improve the range of parameters that can be supplied