Improved-extract-script