Plugin update, more modular, less risk