Make script even more parameterised