converted more for scss