minor changes
merged VSC changes