More progress on better SASS