updated to include 3.x plugin