commiting the issues with messi plugin-fixed