Updated for scrutinizer