my modifications to the vimya plugin