Updated plugin with my personal customisations