Update with latest _s changes