More scruitinizer modifications #1