modified for where condition changes