Added a where clause for better readability