Merge pull request #342 from lukecampbell/parameters

Parameters
Refinements to SA prepare resources
Parameters