Huge performance improvement

Avoid list concatenation