My modifications to the vimya plugin