Can add new criteria as well now