pulled in latest plugin changes