merge extractor code from team's server