Change parameter structure
Fix and improve code
Merge pull request #1 from PhilDunphy23/testing

Change parameter structure