Decided against newing up the criteria - can be left to the controller