Changed the way conditions handle arguments