Added names to tokens, test for condition.