Moving to the main jobcore, modvir modifications