Making much better time by short-circuiting map