Added additional criteria