Improved whole plugin