S3-2025

Merged S3 and S3++ camps for 2025