Rework the SASS