catching you up

I merged your latest stuff and fixed a 3.0 reference.