VS10-12 refactoring started