Proceeding with SASS enhancements