Updated with some criteria

Working on more complex criteria/queries to test the functionality