Updated with VS edits.