some changes to make it sass-ready