some mods
wider usage of @extend