reverted version and cut more plugins