removed not working criteria;
@see todo