Make it so we don't have white space leaking through
Add these parameters where they should be