+ panel extractor todo fixed