refactered code to account for sass framework changes