Changes for scrutinizer. Yay!