Added generator expression code