Modified extrator to work in more situations