jlooper upgrade to 3.x, first pass