Updated plugin to make it better