Some new changes to your very nice plugin