Major SASS upgrade