Switched to underscoreJS map function