data refactor: criteria is now an array