Didn't like async waterfall anyway...