New version to match changed datasets and vm environment