swaped some plugins