Just wrapping
Move back to a single extractor that does supervision and generation of random noise