final update to 2.0 source