redoing some of the @extend pass