Prepare where you collect

Prepare where you collect

Align where you collect with SST requirements