Updated to latest S3 wagon