expanded the where clause to make things clearer