changes to work with vanir