minor changes, but VM might move soon