Made plugin infinitely better