Recoded plugin, few updates and changes here and there