Improve plug start. WIP harakiri