yet more scrutinizer fueled changes