First revision of plug-in