Updated SCanner