Updated scrutinizer