edits for 2.0.x
tweaks for 2.0.x