Updated VS solution