Another VS attempt with big changes