Re-added vvsmpc changes