Updated Where Clause