Edited using new VM